Include the update_counter check in the HAVE_XSYNC condition, since

Mon Jul 12 01:56:26 2004  Matthias Clasen  <maclas@gmx.de>

	* gdk/x11/gdkwindow-x11.c (gdk_toplevel_x11_free_contents):
	Include the update_counter check in the HAVE_XSYNC condition,
	since update_counter isn't present in the !HAVE_XSYNC case.

diff --git a/ChangeLog b/ChangeLog
index 0928ba5d9548ce02e4075c02dca33617f04b765c..4d51c745ce74e2924364175d9fd14136f7a7b70a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jul 12 01:56:26 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gdk/x11/gdkwindow-x11.c (gdk_toplevel_x11_free_contents): 
+       Include the update_counter check in the HAVE_XSYNC condition,
+       since update_counter isn't present in the !HAVE_XSYNC case.
+
 Mon Jul 12 00:52:04 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/stock-icons/Makefile.am: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0928ba5d9548ce02e4075c02dca33617f04b765c..4d51c745ce74e2924364175d9fd14136f7a7b70a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Mon Jul 12 01:56:26 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gdk/x11/gdkwindow-x11.c (gdk_toplevel_x11_free_contents): 
+       Include the update_counter check in the HAVE_XSYNC condition,
+       since update_counter isn't present in the !HAVE_XSYNC case.
+
 Mon Jul 12 00:52:04 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/stock-icons/Makefile.am: 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0928ba5d9548ce02e4075c02dca33617f04b765c..4d51c745ce74e2924364175d9fd14136f7a7b70a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Mon Jul 12 01:56:26 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gdk/x11/gdkwindow-x11.c (gdk_toplevel_x11_free_contents): 
+       Include the update_counter check in the HAVE_XSYNC condition,
+       since update_counter isn't present in the !HAVE_XSYNC case.
+
 Mon Jul 12 00:52:04 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/stock-icons/Makefile.am: 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0928ba5d9548ce02e4075c02dca33617f04b765c..4d51c745ce74e2924364175d9fd14136f7a7b70a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Mon Jul 12 01:56:26 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gdk/x11/gdkwindow-x11.c (gdk_toplevel_x11_free_contents): 
+       Include the update_counter check in the HAVE_XSYNC condition,
+       since update_counter isn't present in the !HAVE_XSYNC case.
+
 Mon Jul 12 00:52:04 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/stock-icons/Makefile.am: 

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 9b749909ac884ada9ba32af58f3b34b05ddf32b3..f8ef65ac4cc9a2c6a74247f4cc454979b5129622 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -1050,17 +1050,17 @@ gdk_toplevel_x11_free_contents (GdkDisplay *display,
       g_object_unref (toplevel->group_leader);
       toplevel->group_leader = NULL;
     }
+#ifdef HAVE_XSYNC
   if (toplevel->update_counter != None)
     {
-#ifdef HAVE_XSYNC
       XSyncDestroyCounter (GDK_DISPLAY_XDISPLAY (display), 
                           toplevel->update_counter);
       toplevel->update_counter = None;
 
       XSyncIntToValue (&toplevel->current_counter_value, 0);
       XSyncIntToValue (&toplevel->pending_counter_value, 0);
-#endif
     }
+#endif
 }
 
 void